merge trunk
authorK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:25:41 +0000 (23:25 +0900)
committerK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:25:41 +0000 (23:25 +0900)

Trivial merge